irq cleanup

Make IRQ related data const or __read_mostly where possible/reasonable,
use platform_legacy_irq() where feasible, and remove the now unused
definition of vector_to_irq().

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/ia64/linux-xen/iosapic.c b/xen/arch/ia64/linux-xen/iosapic.c
index 780702421a272705bcc8fe341b5c2dfbac76208c..89412025654fe155885380082dd86df3f8a5f34b 100644 (file)
--- a/xen/arch/ia64/linux-xen/iosapic.c
+++ b/xen/arch/ia64/linux-xen/iosapic.c
@@ -430,7 +430,7 @@ iosapic_end_level_irq (unsigned int irq)
 #define iosapic_disable_level_irq      mask_irq
 #define iosapic_ack_level_irq          nop
 
-struct hw_interrupt_type irq_type_iosapic_level = {
+static hw_irq_controller irq_type_iosapic_level = {
        .typename =     "IO-SAPIC-level",
        .startup =      iosapic_startup_level_irq,
        .shutdown =     iosapic_shutdown_level_irq,
@@ -476,7 +476,7 @@ iosapic_ack_edge_irq (unsigned int irq)
 #define iosapic_disable_edge_irq       nop
 #define iosapic_end_edge_irq           nop
 
-struct hw_interrupt_type irq_type_iosapic_edge = {
+static hw_irq_controller irq_type_iosapic_edge = {
        .typename =     "IO-SAPIC-edge",
        .startup =      iosapic_startup_edge_irq,
        .shutdown =     iosapic_disable_edge_irq,
@@ -605,7 +605,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
               unsigned long polarity, unsigned long trigger)
 {
        irq_desc_t *idesc;
-       struct hw_interrupt_type *irq_type;
+       hw_irq_controller *irq_type;
        int rte_index;
        int index;
        unsigned long gsi_base;

diff --git a/xen/arch/ia64/linux-xen/irq_ia64.c b/xen/arch/ia64/linux-xen/irq_ia64.c
index c20b021adf4c041dc126ac6ec5a14e0862887c12..3d5d92c7644f60586c6a9802ffe963c1c324355c 100644 (file)
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -233,7 +233,7 @@ void ia64_process_pending_intr(void)
 #ifdef CONFIG_SMP
 extern irqreturn_t handle_IPI (int irq, void *dev_id, struct pt_regs *regs);
 
-static struct irqaction ipi_irqaction = {
+static struct irqaction __read_mostly ipi_irqaction = {
        .handler =      handle_IPI,
 #ifndef XEN
        .flags =        SA_INTERRUPT,

diff --git a/xen/arch/ia64/linux-xen/mca.c b/xen/arch/ia64/linux-xen/mca.c
index a0ba2fffe918670909a3a70ca0010635a4a510f7..b830d3bc269ca7657cee28987052eadd80bb722f 100644 (file)
--- a/xen/arch/ia64/linux-xen/mca.c
+++ b/xen/arch/ia64/linux-xen/mca.c
@@ -1563,7 +1563,7 @@ ia64_mca_disable_cpe_polling(char *str)
 
 __setup("disable_cpe_poll", ia64_mca_disable_cpe_polling);
 
-static struct irqaction cmci_irqaction = {
+static struct irqaction __read_mostly cmci_irqaction = {
        .handler =      ia64_mca_cmc_int_handler,
 #ifndef XEN
        .flags =        SA_INTERRUPT,
@@ -1571,7 +1571,7 @@ static struct irqaction cmci_irqaction = {
        .name =         "cmc_hndlr"
 };
 
-static struct irqaction cmcp_irqaction = {
+static struct irqaction __read_mostly cmcp_irqaction = {
        .handler =      ia64_mca_cmc_int_caller,
 #ifndef XEN
        .flags =        SA_INTERRUPT,
@@ -1579,7 +1579,7 @@ static struct irqaction cmcp_irqaction = {
        .name =         "cmc_poll"
 };
 
-static struct irqaction mca_rdzv_irqaction = {
+static struct irqaction __read_mostly mca_rdzv_irqaction = {
        .handler =      ia64_mca_rendez_int_handler,
 #ifndef XEN
        .flags =        SA_INTERRUPT,
@@ -1587,7 +1587,7 @@ static struct irqaction mca_rdzv_irqaction = {
        .name =         "mca_rdzv"
 };
 
-static struct irqaction mca_wkup_irqaction = {
+static struct irqaction __read_mostly mca_wkup_irqaction = {
        .handler =      ia64_mca_wakeup_int_handler,
 #ifndef XEN
        .flags =        SA_INTERRUPT,
@@ -1596,7 +1596,7 @@ static struct irqaction mca_wkup_irqaction = {
 };
 
 #ifdef CONFIG_ACPI
-static struct irqaction mca_cpe_irqaction = {
+static struct irqaction __read_mostly mca_cpe_irqaction = {
        .handler =      ia64_mca_cpe_int_handler,
 #ifndef XEN
        .flags =        SA_INTERRUPT,
@@ -1604,7 +1604,7 @@ static struct irqaction mca_cpe_irqaction = {
        .name =         "cpe_hndlr"
 };
 
-static struct irqaction mca_cpep_irqaction = {
+static struct irqaction __read_mostly mca_cpep_irqaction = {
        .handler =      ia64_mca_cpe_int_caller,
 #ifndef XEN
        .flags =        SA_INTERRUPT,

diff --git a/xen/arch/ia64/linux-xen/perfmon.c b/xen/arch/ia64/linux-xen/perfmon.c
index 9d31fe91f2d28b6a2bcef2dca607544b1db0758e..10869bfb76982575b90a191be8761e879b810952 100644 (file)
--- a/xen/arch/ia64/linux-xen/perfmon.c
+++ b/xen/arch/ia64/linux-xen/perfmon.c
@@ -6811,7 +6811,7 @@ pfm_flush_pmds(struct task_struct *task, pfm_context_t *ctx)
 #endif
 }
 
-static struct irqaction perfmon_irqaction = {
+static struct irqaction __read_mostly perfmon_irqaction = {
        .handler = pfm_interrupt_handler,
 #ifndef XEN
        .flags   = SA_INTERRUPT,

diff --git a/xen/arch/ia64/linux-xen/sn/kernel/irq.c b/xen/arch/ia64/linux-xen/sn/kernel/irq.c
index 8cd350f7a7ab41f32daaf2729120db8a7cf6fe73..82d949ee6496411303961e3a75fae1928bea4d8d 100644 (file)
--- a/xen/arch/ia64/linux-xen/sn/kernel/irq.c
+++ b/xen/arch/ia64/linux-xen/sn/kernel/irq.c
@@ -221,7 +221,7 @@ static void sn_set_affinity_irq(unsigned int irq, cpumask_t mask)
 }
 #endif
 
-struct hw_interrupt_type irq_type_sn = {
+static hw_irq_controller irq_type_sn = {
 #ifndef XEN
        .name           = "SN hub",
 #else

diff --git a/xen/arch/ia64/linux/irq_lsapic.c b/xen/arch/ia64/linux/irq_lsapic.c
index ea14e6a04409636c62813048504cf77e3ef57949..58edf0d21c0b044067f77b2d68a4d5fbc4f02f90 100644 (file)
--- a/xen/arch/ia64/linux/irq_lsapic.c
+++ b/xen/arch/ia64/linux/irq_lsapic.c
@@ -26,7 +26,7 @@ lsapic_noop (unsigned int irq)
        /* nuthing to do... */
 }
 
-struct hw_interrupt_type irq_type_ia64_lsapic = {
+hw_irq_controller irq_type_ia64_lsapic = {
        .typename =     "LSAPIC",
        .startup =      lsapic_noop_startup,
        .shutdown =     lsapic_noop,

diff --git a/xen/arch/ia64/xen/irq.c b/xen/arch/ia64/xen/irq.c
index 712729c7a6c31cf40edc54ae27dafe9eeb694db5..2254cf42c3a7daf751159079b9f4a0170e7d0b9f 100644 (file)
--- a/xen/arch/ia64/xen/irq.c
+++ b/xen/arch/ia64/xen/irq.c
@@ -118,7 +118,7 @@ static void ack_none(unsigned int irq)
 #define shutdown_none  disable_none
 #define end_none       enable_none
 
-struct hw_interrupt_type no_irq_type = {
+hw_irq_controller no_irq_type = {
        "none",
        startup_none,
        shutdown_none,

diff --git a/xen/arch/ia64/xen/xentime.c b/xen/arch/ia64/xen/xentime.c
index 710570731dcd8ebe2faf00a65ffa740dbb62555e..de83438250a9bd3a7e8e4329bbe141e671e17f55 100644 (file)
--- a/xen/arch/ia64/xen/xentime.c
+++ b/xen/arch/ia64/xen/xentime.c
@@ -154,7 +154,7 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
        raise_softirq(TIMER_SOFTIRQ);
 }
 
-static struct irqaction xen_timer_irqaction = {
+static struct irqaction __read_mostly xen_timer_irqaction = {
        .handler =      (void *) xen_timer_interrupt,
        .name =         "timer"
 };

diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index f2ba93a883050646784986249e98a00804b8006b..380066262401e996921f05a11a5e78f8644e0987 100644 (file)
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -319,7 +319,7 @@ static void hpet_msi_set_affinity(unsigned int irq, cpumask_t mask)
 /*
  * IRQ Chip for MSI HPET Devices,
  */
-static struct hw_interrupt_type hpet_msi_type = {
+static hw_irq_controller hpet_msi_type = {
     .typename   = "HPET-MSI",
     .startup    = hpet_msi_startup,
     .shutdown   = hpet_msi_shutdown,

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index beec1fc72c0de60f04df0a08b8ae86cb82721241..1fb18cd150967d3bc6e341df4ab79d1f2bcf81d8 100644 (file)
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -507,7 +507,7 @@ static int irq_load_isa(struct domain *d, hvm_domain_context_t *h)
 
     /* Adjust the GSI assert counts for the ISA IRQ line state.
      * This relies on the PCI IRQ state being loaded first. */
-    for ( irq = 0; irq < 16; irq++ )
+    for ( irq = 0; platform_legacy_irq(irq); irq++ )
         if ( test_bit(irq, &hvm_irq->isa_irq.i) )
             hvm_irq->gsi_assert_count[hvm_isa_irq_to_gsi(irq)]++;
 

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index a44dd068aea40920fe0124287719b1d30e300d6b..2474f7864d4426e1d8396e2892bd3d5fd3d42782 100644 (file)
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -97,7 +97,7 @@ static void end_8259A_irq(unsigned int irq)
         enable_8259A_irq(irq);
 }
 
-static struct hw_interrupt_type i8259A_irq_type = {
+static struct hw_interrupt_type __read_mostly i8259A_irq_type = {
     .typename = "XT-PIC",
     .startup  = startup_8259A_irq,
     .shutdown = disable_8259A_irq,
@@ -347,7 +347,7 @@ void __devinit init_8259A(int auto_eoi)
     spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
-static struct irqaction cascade = { no_action, "cascade", NULL};
+static struct irqaction __read_mostly cascade = { no_action, "cascade", NULL};
 
 void __init init_IRQ(void)
 {
@@ -366,7 +366,7 @@ void __init init_IRQ(void)
         set_intr_gate(vector, interrupt[vector]);
     }
 
-    for (irq = 0; irq < 16; irq++) {
+    for (irq = 0; platform_legacy_irq(irq); irq++) {
         struct irq_desc *desc = irq_to_desc(irq);
         struct irq_cfg *cfg = desc->chip_data;
         

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 4337484fdb00c366a3c1e8c2871f5bf2314c31d0..9422fb494382617351692c40f6f16baeb7e77120 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -62,7 +62,8 @@ int sis_apic_bug = -1;
 /*
  * # of IRQ routing registers
  */
-int nr_ioapic_registers[MAX_IO_APICS];
+int __read_mostly nr_ioapic_registers[MAX_IO_APICS];
+int __read_mostly nr_ioapics;
 
 int disable_timer_pin_1 __initdata;
 
@@ -497,7 +498,7 @@ void /*__init*/ setup_ioapic_dest(void)
  */
 static int EISA_ELCR(unsigned int irq)
 {
-    if (irq < 16) {
+    if (platform_legacy_irq(irq)) {
         unsigned int port = 0x4d0 + (irq >> 3);
         return (inb(port) >> (irq & 7)) & 1;
     }
@@ -763,8 +764,8 @@ static inline int IO_APIC_irq_trigger(int irq)
     return 0;
 }
 
-static struct hw_interrupt_type ioapic_level_type;
-static struct hw_interrupt_type ioapic_edge_type;
+static hw_irq_controller ioapic_level_type;
+static hw_irq_controller ioapic_edge_type;
 
 #define IOAPIC_AUTO    -1
 #define IOAPIC_EDGE    0
@@ -844,7 +845,7 @@ static void __init setup_IO_APIC_irqs(void)
                 entry.vector = vector;
                 ioapic_register_intr(irq, IOAPIC_AUTO);
 
-                if (!apic && (irq < 16))
+                if (!apic && platform_legacy_irq(irq))
                     disable_8259A_irq(irq);
             }
             cfg = irq_cfg(irq);
@@ -1358,7 +1359,7 @@ static unsigned int startup_edge_ioapic_irq(unsigned int irq)
     unsigned long flags;
 
     spin_lock_irqsave(&ioapic_lock, flags);
-    if (irq < 16) {
+    if (platform_legacy_irq(irq)) {
         disable_8259A_irq(irq);
         if (i8259A_irq_pending(irq))
             was_pending = 1;
@@ -1408,7 +1409,7 @@ static unsigned int startup_level_ioapic_irq (unsigned int irq)
     return 0; /* don't check for pending */
 }
 
-int ioapic_ack_new = 1;
+int __read_mostly ioapic_ack_new = 1;
 static void setup_ioapic_ack(char *s)
 {
     if ( !strcmp(s, "old") )
@@ -1572,7 +1573,7 @@ static void end_edge_ioapic_irq(unsigned int irq)
  * edge-triggered handler, without risking IRQ storms and other ugly
  * races.
  */
-static struct hw_interrupt_type ioapic_edge_type = {
+static hw_irq_controller ioapic_edge_type = {
     .typename  = "IO-APIC-edge",
     .startup   = startup_edge_ioapic_irq,
     .shutdown  = disable_edge_ioapic_irq,
@@ -1583,7 +1584,7 @@ static struct hw_interrupt_type ioapic_edge_type = {
     .set_affinity      = set_ioapic_affinity_irq,
 };
 
-static struct hw_interrupt_type ioapic_level_type = {
+static hw_irq_controller ioapic_level_type = {
     .typename  = "IO-APIC-level",
     .startup   = startup_level_ioapic_irq,
     .shutdown  = mask_IO_APIC_irq,
@@ -1631,7 +1632,7 @@ static void set_msi_affinity_irq(unsigned int irq, cpumask_t cpu_mask)
  * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
  * which implement the MSI or MSI-X Capability Structure.
  */
-struct hw_interrupt_type pci_msi_type = {
+hw_irq_controller pci_msi_type = {
     .typename   = "PCI-MSI",
     .startup    = startup_msi_irq,
     .shutdown   = shutdown_msi_irq,
@@ -1646,7 +1647,7 @@ static inline void init_IO_APIC_traps(void)
 {
     int irq;
     /* Xen: This is way simpler than the Linux implementation. */
-    for (irq = 0; irq < 16 ; irq++)
+    for (irq = 0; platform_legacy_irq(irq); irq++)
         if (IO_APIC_IRQ(irq) && !IO_APIC_VECTOR(irq))
             make_8259A_irq(irq);
 }
@@ -1674,7 +1675,7 @@ static void ack_lapic_irq(unsigned int irq)
 
 static void end_lapic_irq(unsigned int irq) { /* nothing */ }
 
-static struct hw_interrupt_type lapic_irq_type = {
+static hw_irq_controller lapic_irq_type = {
     .typename  = "local-APIC-edge",
     .startup   = NULL, /* startup_irq() not used for IRQ0 */
     .shutdown  = NULL, /* shutdown_irq() not used for IRQ0 */
@@ -2107,7 +2108,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
     /*
      * IRQs < 16 are already in the irq_2_pin[] map
      */
-    if (irq >= 16)
+    if (!platform_legacy_irq(irq))
         add_pin_to_irq(irq, ioapic, pin);
 
     vector = assign_irq_vector(irq);
@@ -2122,7 +2123,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
 
     ioapic_register_intr(irq, edge_level);
 
-    if (!ioapic && (irq < 16))
+    if (!ioapic && platform_legacy_irq(irq))
         disable_8259A_irq(irq);
 
     spin_lock_irqsave(&ioapic_lock, flags);

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 6e566ab9d90b0b9f589121c887a8452b7d965731..30d223bea5d5579d21d52b9ad88bec599300ecdc 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -24,7 +24,7 @@
 #include <public/physdev.h>
 
 /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */
-int opt_noirqbalance = 0;
+int __read_mostly opt_noirqbalance = 0;
 boolean_param("noirqbalance", opt_noirqbalance);
 
 unsigned int __read_mostly nr_irqs_gsi = 16;
@@ -45,7 +45,7 @@ DECLARE_BITMAP(used_vectors, NR_VECTORS);
 
 struct irq_cfg __read_mostly *irq_cfg = NULL;
 
-static struct timer *irq_guest_eoi_timer;
+static struct timer *__read_mostly irq_guest_eoi_timer;
 
 static DEFINE_SPINLOCK(vector_lock);
 
@@ -60,7 +60,7 @@ static DEFINE_SPINLOCK(irq_ratelimit_lock);
 static struct timer irq_ratelimit_timer;
 
 /* irq_ratelimit: the max irq rate allowed in every 10ms, set 0 to disable */
-unsigned int __read_mostly irq_ratelimit_threshold = 10000;
+static unsigned int __read_mostly irq_ratelimit_threshold = 10000;
 integer_param("irq_ratelimit", irq_ratelimit_threshold);
 
 /* Must be called when irq disabled */
@@ -321,7 +321,7 @@ static void ack_none(unsigned int irq)
 #define shutdown_none   disable_none
 #define end_none        enable_none
 
-struct hw_interrupt_type no_irq_type = {
+hw_irq_controller no_irq_type = {
     "none",
     startup_none,
     shutdown_none,

diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index 2856c1ac6c48ec4ed3f6858dadd9990e5b593411..bd94588aa5eec8cc7376312e9f52a1060d6f793f 100644 (file)
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -58,8 +58,6 @@ struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
 /* MP IRQ source entries */
 int mp_irq_entries;
 
-int nr_ioapics;
-
 int pic_mode;
 unsigned long mp_lapic_addr;
 
@@ -525,7 +523,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
                }
        }
 
-       for (i = 0; i < 16; i++) {
+       for (i = 0; platform_legacy_irq(i); i++) {
                switch (mpc_default_type) {
                case 2:
                        if (i == 0 || i == 13)
@@ -1037,7 +1035,7 @@ void __init mp_config_acpi_legacy_irqs (void)
         * Use the default configuration for the IRQs 0-15.  Unless
         * overriden by (MADT) interrupt source override entries.
         */
-       for (i = 0; i < 16; i++) {
+       for (i = 0; platform_legacy_irq(i); i++) {
                int idx;
 
                for (idx = 0; idx < mp_irq_entries; idx++) {

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 3a0d0db0b63dd5cc9d521cd4af43209ab161b497..06bf69f51db812eab668f312dbebfe5fff65aa08 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -232,7 +232,7 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs)
     }
 }
 
-static struct irqaction irq0 = { timer_interrupt, "timer", NULL };
+static struct irqaction __read_mostly irq0 = { timer_interrupt, "timer", NULL };
 
 /* ------ Calibrate the TSC ------- 
  * Return processor ticks per second / CALIBRATE_FRAC.

diff --git a/xen/common/domain.c b/xen/common/domain.c
index ab3c5bb745304108a1ff657c0af063085671591e..f07d800cfcc4e95de25e692b83e66743f676b3b9 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -198,7 +198,8 @@ struct vcpu *alloc_idle_vcpu(unsigned int cpu_id)
     return alloc_vcpu(d, vcpu_id, cpu_id);
 }
 
-static unsigned int extra_dom0_irqs = 256, extra_domU_irqs = 32;
+static unsigned int __read_mostly extra_dom0_irqs = 256;
+static unsigned int __read_mostly extra_domU_irqs = 32;
 static void __init parse_extra_guest_irqs(const char *s)
 {
     if ( isdigit(*s) )

diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index 62775d5a22d39f1d2787f85f7528019dfb69bb88..f33e9f55ae7f2705224d19fd346fd8cdfdca7b6a 100644 (file)
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -406,7 +406,7 @@ static void iommu_msi_end(unsigned int irq)
 }
 
 
-static struct hw_interrupt_type iommu_msi_type = {
+static hw_irq_controller iommu_msi_type = {
     .typename = "AMD_IOV_MSI",
     .startup = iommu_msi_startup,
     .shutdown = iommu_msi_mask,

diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 4d5702e7293535b26ac2847f10c26b48ad61778d..92cf62b9f4e0252a62bf4576c180cbe06f5aeea7 100644 (file)
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -871,7 +871,7 @@ static void dma_msi_set_affinity(unsigned int irq, cpumask_t mask)
     spin_unlock_irqrestore(&iommu->register_lock, flags);
 }
 
-static struct hw_interrupt_type dma_msi_type = {
+static hw_irq_controller dma_msi_type = {
     .typename = "DMA_MSI",
     .startup = dma_msi_startup,
     .shutdown = dma_msi_mask,

diff --git a/xen/include/asm-ia64/linux-xen/asm/hw_irq.h b/xen/include/asm-ia64/linux-xen/asm/hw_irq.h
index 9578cd965e62ac5f80c49283ae7bcf88dd3f925e..91af960906d128d96823d3284cf2274ebd31254d 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/hw_irq.h
+++ b/xen/include/asm-ia64/linux-xen/asm/hw_irq.h
@@ -79,7 +79,7 @@ enum {
 extern __u8 isa_irq_to_vector_map[16];
 #define isa_irq_to_vector(x)   isa_irq_to_vector_map[(x)]
 
-extern struct hw_interrupt_type irq_type_ia64_lsapic;  /* CPU-internal interrupt controller */
+extern hw_irq_controller irq_type_ia64_lsapic; /* CPU-internal interrupt controller */
 
 extern int assign_irq_vector (int irq);        /* allocate a free vector */
 extern void free_irq_vector (int vector);
@@ -91,7 +91,7 @@ extern int setup_vector(unsigned int vec, struct irqaction *action);
 #endif
 
 static inline void
-hw_resend_irq (struct hw_interrupt_type *h, unsigned int vector)
+hw_resend_irq (hw_irq_controller *h, unsigned int vector)
 {
        platform_send_ipi(smp_processor_id(), vector, IA64_IPI_DM_INT, 0);
 }

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 90f5fd26f37fdd84a87050062468960f5bdd3b77..c10aafb59cceed9970767e09c5c1b3768abfd543 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -10,8 +10,9 @@
 #include <irq_vectors.h>
 #include <asm/percpu.h>
 
-#define IO_APIC_IRQ(irq)    (((irq) >= 16 && (irq) < nr_irqs_gsi) \
-        || (((irq) < 16) && (1<<(irq)) & io_apic_irqs))
+#define IO_APIC_IRQ(irq)    (platform_legacy_irq(irq) ?    \
+                            (1 << (irq)) & io_apic_irqs : \
+                            (irq) < nr_irqs_gsi)
 #define IO_APIC_VECTOR(irq) (irq_vector[irq])
 
 #define MSI_IRQ(irq)       ((irq) >= nr_irqs_gsi && (irq) < nr_irqs)
@@ -19,14 +20,12 @@
 #define LEGACY_VECTOR(irq)          ((irq) + FIRST_LEGACY_VECTOR)
 #define LEGACY_IRQ_FROM_VECTOR(vec) ((vec) - FIRST_LEGACY_VECTOR)
 
-#define vector_to_irq(vec)  (vector_irq[vec])
-#define irq_to_desc(irq)    &irq_desc[(irq)]
+#define irq_to_desc(irq)    (&irq_desc[irq])
+#define irq_cfg(irq)        (&irq_cfg[irq])
 
 #define MAX_GSI_IRQS PAGE_SIZE * 8
 #define MAX_NR_IRQS (2 * MAX_GSI_IRQS)
 
-#define irq_cfg(irq)        &irq_cfg[(irq)]
-
 struct irq_cfg {
         int  vector;
         cpumask_t domain;

diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h
index 0056da7e6a9f505eb473d2de7f22cbac4854a3a9..bc8ab0e870adf78964a042199a461c7e631edc35 100644 (file)
--- a/xen/include/asm-x86/msi.h
+++ b/xen/include/asm-x86/msi.h
@@ -117,7 +117,7 @@ int msi_free_irq(struct msi_desc *entry);
  */
 #define NR_HP_RESERVED_VECTORS         20
 
-extern struct hw_interrupt_type pci_msi_type;
+extern const struct hw_interrupt_type pci_msi_type;
 
 /*
  * MSI-X Address Register

diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index 23565ae2f38091f8f33107f570264f4ad22a7e9e..dae4a2a1223f83a0fef16060437a7e3e96d7f238 100644 (file)
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -47,7 +47,7 @@ struct hw_interrupt_type {
     void (*set_affinity)(unsigned int irq, cpumask_t mask);
 };
 
-typedef struct hw_interrupt_type hw_irq_controller;
+typedef const struct hw_interrupt_type hw_irq_controller;
 
 #include <asm/irq.h>